[automerger skipped] [Activity embedding] Fix unexpected finished 2nd layer...

[automerger skipped] [Activity embedding] Fix unexpected finished 2nd layer problem am: 9e207bfc am: 67dc170d -s ours

am skip reason: Merged-In I262327cc49c3a4434a183eb00ac57f47fa598f70 with SHA-1 31eec492 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309891



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