Merge "Remove redundant setContentView to fix screenshot focus" into tm-qpr-dev am: 1a033981 am: 4a15f0d0 am: 0904eb4a am: 474d5f95

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



Change-Id: I719790caa2fa58dd2b3e8c66cd0c6ed09515b30a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>