Merge "Make process level rotated config and display metrics consistent" into...

Merge "Make process level rotated config and display metrics consistent" into rvc-qpr-dev am: d6af5b5d

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

Change-Id: I1ca8add8df59a72e35ced7d0f888c662e01d7dc2