[automerger skipped] DO NOT MERGE am: 945e78f9 -s ours am: e5f1e4a6 -s...

[automerger skipped] DO NOT MERGE am: 945e78f9 -s ours am: e5f1e4a6 -s ours am: 2a4c5f99 -s ours am: 802e7b58 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17325442



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