Merge \\"Show info icon when RestrictedListPreference is disabled\\" into nyc-mr1-dev am: b0a4c897ac
am: b62a70db93

Change-Id: I033c13b26dec6973f66dc48c491f7a1b15232381