Merge "Fix the highlight error after unfolding the device" into sc-v2-dev am: d4b1048dbf

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

Change-Id: I8a94d8977bd583a59ddd4a658ca50fd6708c2684