Merge changes from topic "b149942757-remove-view-injection" into sc-v2-dev am: 1fe4da51

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

Change-Id: I96cf0da91efe6aee2dea3fe2913263a6d77f2103