Merge changes from topic "am-08a155ca62144e49bad1deffa5127df4" am: dd79408d...

Merge changes from topic "am-08a155ca62144e49bad1deffa5127df4" am: dd79408d am: 8eac3754 am: 2971e168 am: 4a9dd74b am: 481b3538

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1239888



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