[automerger skipped] Merge "[DO NOT MERGE] ActivityEmbedding: hide embedded...

[automerger skipped] Merge "[DO NOT MERGE] ActivityEmbedding: hide embedded TaskFragment between adjacent TFs" into sc-v2-dev am: c48dfe54 am: dcd66a37 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If4cfc2b1b4fc31327414a033f2ddeb4aa04078c1