Merge "Prevent NullPointerException in ActivityRecord when in Size Compat...

Merge "Prevent NullPointerException in ActivityRecord when in Size Compat Mode" into tm-qpr-dev am: a77ae5c0 am: 7dd608ca am: 82ba46ad

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



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