Merge changes I0049d5ba,I28ebc5a2 am: 180cf9d109 am: b736341e3e am: 964194662e

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

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