[automerger skipped] Merge "Make process level rotated config and display...

[automerger skipped] Merge "Make process level rotated config and display metrics consistent" into rvc-qpr-dev am: d6af5b5d am: 33d7e930 -s ours

am skip reason: Change-Id I60bedc7e09f54683d5e857ccc51402d5d144cd9e with SHA-1 d5c5a1b4 is in history

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

Change-Id: I5861e7d98be8c78b9b17e0594fd6a2b42efdd400