Merge "Remove redundant setContentView to fix screenshot focus" into tm-qpr-dev am: 1a033981

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



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