Merge changes I70c174c4,Ifc365e3b am: 1f92dc1a07

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

Change-Id: Ia9af1a6e1331c65d20433105221d7793dd13f533