Merge changes Ib5012456,Idbfb49c2,Ieb953c18 am: 4e0a7f22fa am: 9d6a710fb0 am: 4b900a96b0

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

Change-Id: I37d95dac0ac3da662654d0a03901f14c92d1b9a8