Merge "Remove duplicate screenshot view from xml" into rvc-dev am: e5fe32ec am: 2a037b7e

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

Change-Id: I9344f271e613fa351d49b017e49465f09fc120df