Merge "Fix unexpected highlight" am: e763da5884 am: 6e347e61ca am: b03d666b47

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

Change-Id: I60dbfab818b97007025b1a295d1c8d157320279a