Merge changes Ib90ae553,I3ca3ad9c am: e74976cccd

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

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