Merge "Merge "Remove duplicate screenshot view from xml" into rvc-dev am:...

Merge "Merge "Remove duplicate screenshot view from xml" into rvc-dev am: e5fe32ec am: 2a037b7e am: ac1929a3" into rvc-qpr-dev-plus-aosp am: 786647f6

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

Change-Id: I5e39c2ee1dbddce9519f47826bfc1c2c4caca45b