Merge changes I0049d5ba,I28ebc5a2 am: 180cf9d109

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2476009

Change-Id: I0f7146d6f813ac87fb64860edc42d568f492b4ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>