Merge changes from topic "am-cc11d65e1ffe4630b407596190df86a1" am: d33cbfdce5

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

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