Merge changes I29453595,I6586c8e5 am: 0f7b66b6 am: 1cf73b36 am: 41fac608...

Merge changes I29453595,I6586c8e5 am: 0f7b66b6 am: 1cf73b36 am: 41fac608 am: cae7d169 am: c0f8f45c

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



Change-Id: I3980aad6c0079d58d39c2d31ec80a7cbe2ef565b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>