Merge "Add user aspect ratio settings intent" into udc-qpr-dev am: 8a4ce2a5 am: fb99b652

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



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