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

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

Change-Id: I9b9571f8ff033530f80823aec6b4321ce604272a