[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: 8582ebea -s ours am: b310ba4a -s ours am: 5f094ab8 -s ours am: c8844f9a -s ours am: 7fe0f676 -s ours

am skip reason: subject contains skip directive

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



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