[automerger skipped] Merge "nfc(api): Use settings key and feature string since the API is @hide" into main am: f621432634 am: dc8efa9bb8 -s ours

am skip reason: Merged-In Iecbf1b58ee2305c509da9c90cd421ee0cb91d379 with SHA-1 517e8a3fac is already in history

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

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