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

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

Change-Id: I3a227938ed47529d18c58afdc98b711a1e49921a