Merge "Use legacy layer name for screenshot shell display rotation" into...

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

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



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