Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev am: 205d10b
am: fc6317d

* commit 'fc6317db844fe6c6fbc549461ff02070e8b06af4':

Change-Id: I405e258e02efc852e65d27eaf4c3d0bf45f26b45