[automerger skipped] Merge "Update lint baseline for...

[automerger skipped] Merge "Update lint baseline for SettingsLibMainSwitchPreference" into sc-dev am: 6ff6f1b0 am: 24762003 am: 6667167a -s ours

am skip reason: Merged-In Ia1077b3077cd14cb1b1f39352195558d0644a3f7 with SHA-1 c1fe1ef4 is already in history

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

Change-Id: Ic8904262d24a6e12db4b2c769996a780a9d00cb0