Merge "Remove dismiss target only when it's attached to a parent." into...

Merge "Remove dismiss target only when it's attached to a parent." into tm-qpr-dev am: 489880bc am: c200b846 am: 4d54f755

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



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