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

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

Change-Id: I0b41817330ff0f8c942cf6d8427805bb8e7d4f71