Merge changes I5458127b,Ib36bf44c,I481548e8,I449de193 am: 1aad41c3e7

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

Change-Id: Ia971cab37bc0953f20c2cbb03b5d2b505f0782c6