Merge "Fix NPE for user aspect ratio button in multi-window" into udc-qpr-dev am: 88b585c5

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



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