Merge "Fix ExtraText lint errors" am: 000bc450 am: 91420db7 am: 2058af23...

Merge "Fix ExtraText lint errors" am: 000bc450 am: 91420db7 am: 2058af23 am: 52afebe9 am: bcc4a3b4

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



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