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

Change-Id: Ic9f17f748d414e7c5307d4e81d79a1a55a444091