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