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

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

Change-Id: Ic8a87daefbc9d86ef11846bcea895c4c91661838