Merge "Use legacy layer name for screenshot shell display rotation" into tm-qpr-dev am: 1a27751c

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



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