Merge "Fix NullPointerException in aspect ratio restrictions" into tm-qpr-dev am: 7522d056 am: 3e344b92 am: 33b0b3af am: d11cd2c7

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



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