Merge "Merge SQ1A.220205.002" am: c45b4ab9ae

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

Change-Id: I38d97dff8fcb284120608d2bbfb369a7374a4398