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

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



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