Merge changes I2360314c,I51bd32c6,Icb136327,Id8425488 am: 10b69128 am:...

Merge changes I2360314c,I51bd32c6,Icb136327,Id8425488 am: 10b69128 am: 5676d384 am: 67fb1b8c am: e8a83dcb am: 7f4a37a3

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



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