Merge "Remove duplicate screenshot view from xml" into rvc-dev am: e5fe32ec am: 79ee513a

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

Change-Id: Icade63fb16b2edaa6a913d62cacd128779ae7462