Merge "resolve merge conflicts of d42d9a41 to...

Merge "resolve merge conflicts of d42d9a41 to sc-dev" into sc-dev am: 321f4133

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

Change-Id: I019ec2f2f5ed6ec8d2be519d821ee7f139af4bb3