Merge changes I219f956b,I281937e2 am: a216080a63 am: fc8ed5d9d5

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

Change-Id: I16ebd75b0f0c9878d01ecc217e182c99cc064d2d