Merge changes I669a03a6,Ibb774d6d am: f6d42d45c5 am: a80dc0d4e2 am: 028323f995 am: 1aa973604d

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

Change-Id: I24ee9d8db8c2a534b4747cd79f1afeaeee818970