[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "forced-non-staged-apex-update", "non-staged-flag" into main am: c0bda5b6 am: 782db801 -s ours am: 13e02398 -s ours

am skip reason: Merged-In Ic0abb9e97d529910805af50208baf42b9b28b171 with SHA-1 b45adeaf is already in history

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



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