Merge changes Ie5e47d84,I3c5c9917,Ife48b163 am: 9f2c62481f

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

Change-Id: I91df1e384d10566dc9fb31220681719bbfc240a9