Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am:...

Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c1 am: a19f93e7 am: e0fd5aa9

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

Change-Id: I9b9571f8ff033530f80823aec6b4321ce604272a