Merge "Introduce EdgeToEdgeActivityContent" into udc-qpr-dev am: db3f1d595f am: beeade432c

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

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