[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: 3d4a598a am: d04783b7 -s ours am: 3ef28534 -s ours

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

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



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