[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "b149942757-remove-view-injection" into sc-v2-dev am: 1fe4da51 am: 5800b860 -s ours

am skip reason: Merged-In Ib0a21aad64ab141fc4d16a181e8fba64014ea16f with SHA-1 940a1d26 is already in history

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

Change-Id: I9d63eadfd1e3e89777bcb5b53e3fc41f7fbef294