Merge changes Ie93d09b3,I56f0218f,I3c9a3855 am: 4872b73b9e am: 5487958d34

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

Change-Id: I603124ccabb0f3dd858a1ff1f7d3811c815aa9bf