Merge changes Ieb949243,I04f07c81 am: 915ea84d

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



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