[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-fa9741c9c05a4b19ab12f2b89663cacb" am: 78bb0a85 -s ours am: bcecaa97 -s ours

am skip reason: Merged-In Ic84901ce5af766338b2cab07c3cf10841ba9a150 with SHA-1 40b59a61 is already in history

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



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