[automerger skipped] Merge "Preventing NPE crash if view is detached from...

[automerger skipped] Merge "Preventing NPE crash if view is detached from window." into tm-dev am: 76386f47 am: 5fa57299 -s ours am: 445190d7 -s ours

am skip reason: Merged-In I792417a55a588c9552529f2815c1ab5d88f427e7 with SHA-1 e4f2b2c0 is already in history

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



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