Merge changes from topic "am-160c9f8b5caf40a2a0b6fae94210de90" am: 437a607b...

Merge changes from topic "am-160c9f8b5caf40a2a0b6fae94210de90" am: 437a607b am: ba89dafc am: f7b1614b am: def27ce2

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



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