Merge changes Ib90ae553,I3ca3ad9c am: e74976cccd am: f9bfa851c2

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

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