tree 4015d01f68255d4f03589bb88987c15cdf1234c9
parent ac46172c79bae9fe52f15fc0f0867c2e904cb10e
author Jeff Sharkey <jsharkey@android.com> 1508864925 -0600
committer Jeff Sharkey <jsharkey@android.com> 1508869187 -0600

Pass both partition GUID and filesystem UUID.

FDE keys are indexed using the partition GUID, while FBE keys will be
indexed using the filesystem UUID, so pass both of those identifiers
along when forgetting a volume.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AdoptableHostTest
Bug: 25861755
Change-Id: I6e239d5ba67a01c9a848d705f6167da00f975924