DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f

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

Change-Id: I7325883698b037f16083f2dfa39db84feb21f698