tree 1fdf4343f5a5a121bdce283e891211c79a2dacad
parent 23fdbc793731863e175c029b3714410fc5d05bad
parent 8cf1eda02526c7ec7a28970dc106fed4eab509b4
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580508861 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580508861 +0000

Merge "Rename key_dir to metadata_key_dir and refactor" am: a7463139cd am: 8cf1eda025

Change-Id: I0933c434c9c63e15f8af648aa99250eea95aa3bd