tree 41df071739359e1fa20c173b52dbc125682a1aa9
parent bdd9fbf9dbda429393ee0d86a74c71fdfbaa6a19
parent 6891eb7e2dcbde5e5abe07a781f3e5544941c094
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582070722 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582070722 +0000

Merge changes from topics "metadata_wrapped_key_aosp", "volume_metadata" am: 36fd1ebfae am: 6891eb7e2d

Change-Id: I39904b704f983124afd8ff62cd3b863fd600e6a2