Revert "Fix highlight for RestrictedPreference"

This reverts commit 944268f2c2b16d626adecb1deda128b3dce1d1cc.

Reason for revert: Regression

Bug: 185789867

Change-Id: Ibae960a7aa076593dc57c60e13addf8b68e65dc1
2 files changed