Merge changes from topics "forced-non-staged-apex-update", "non-staged-flag"...

Merge changes from topics "forced-non-staged-apex-update", "non-staged-flag" into main am: c0bda5b6

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



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