Merge "nfc(api): Address API council feedback for always on API" into main am: 9ab68f3e03 am: 28f3467775

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

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