[automerger skipped] Merge "Reset embedded TaskFragment override when entering...

[automerger skipped] Merge "Reset embedded TaskFragment override when entering PIP" into tm-dev am: ff5064e7 am: 7b46957d -s ours am: f7c020a4 -s ours

am skip reason: Merged-In I03bd679b77f7ed8a65ba5fc59723b83a4254442c with SHA-1 bc357abc is already in history

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



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