Merge changes I219f956b,I281937e2 am: a216080a63

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

Change-Id: Icbc7fa2fac8a085f5a4c4aceae519eff0292cfb1