Commit 60b92f8e authored Mar 03, 2021 by Xin Li Committed by Automerger Merge Worker Mar 03, 2021

[automerger skipped] Merge "Merge RQ2A.210305.007" am: 6b94f5ac -s ours

am skip reason: Change-Id I12e20519ac29f802f9983dcf27f313388b33829c with SHA-1 9059706e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0345dadeff9da4646a382bee8f083233e2c4a55c

There are no changes