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

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

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