Merge "Fix the highlight error and remove the empty card" into sc-v2-dev am: e06fb6348a

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

Change-Id: Idacf7580710ead66aeec0c46261e447865f6247d