Merge "DO NOT MERGE Fix crash related to getting the root of an unattached view" into tm-qpr-dev am: 668d3a9a

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



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