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

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



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