Merge changes from topic "am-cc11d65e1ffe4630b407596190df86a1" am: d33cbfdc am: 562daf46

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



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