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

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

Change-Id: I3793ee2a9972e257bbb05eb7bc7fef148f0b996d