Merge "Fix null object ref in UserAspectRatioAppPreferenceTest" into udc-qpr-dev am: 7dff7a0d56

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

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