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

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

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