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

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

Change-Id: Ie601f7835d5cb99dbd1491deaae5ed394a94c549