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

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

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