Merge "Merge "Display-level relative display rotation should be 0" into...

Merge "Merge "Display-level relative display rotation should be 0" into tm-qpr-dev am: e0e646c4" into tm-qpr-dev-plus-aosp am: e1726498

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



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