Merge "Don't add insets when a container is detached" into tm-qpr-dev am: 82a9156b am: 463a8e9d

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



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