Merge "Move spinner_dropdown_restricted_item to Settings." into nyc-dev am: f7a2afb4fc
am: 24d8e86219

* commit '24d8e8621953cc2a4eaed3c161b3f371f0c5538c':

Change-Id: I84ba340c9f2b9f77b8e2a6767801673b973c99d8