[automerger skipped] Merge "Enable the...

[automerger skipped] Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" into tm-qpr-dev am: 67b00f00 am: 510d653b -s ours am: 82736a7d -s ours

am skip reason: Merged-In I0f5e5a10250049fb9425eac7c113b803b6701cc7 with SHA-1 cf4ee7be is already in history

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



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