Merge "Add warning text to Aspect ratio app info header" into udc-qpr-dev am:...

Merge "Add warning text to Aspect ratio app info header" into udc-qpr-dev am: b5b8bd54 am: 112b5765

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24904381



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