Merge changes I3f56a83e,Icce8c1b5 am: adae766986

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

Change-Id: I88b1c0101adad361117c2c6aa9a00d2f21f27541