[automerger skipped] Merge "DO NOT MERGE Fix crash related to getting the root...

[automerger skipped] Merge "DO NOT MERGE Fix crash related to getting the root of an unattached view" into tm-qpr-dev am: 668d3a9a am: 405cf304 -s ours am: 3fab8e30 -s ours am: b476e437 -s ours

am skip reason: subject contains skip directive

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



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