Merge "Fix NullPointerException in aspect ratio restrictions" into tm-qpr-dev am: 7522d056

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



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