Merge "Fully qualify @attr reference to android.R field" into main am: e61c03648d am: aea2622b91

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3296753

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