[automerger skipped] RESTRICT AUTOMERGE: Fix build breakage from merge...

[automerger skipped] RESTRICT AUTOMERGE: Fix build breakage from merge conflict. am: 51898058 -s ours am: 2bd5ab6f -s ours am: 04928c87 -s ours am: 7c5b922a -s ours am: d657a629 -s ours

am skip reason: subject contains skip directive

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



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