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

* commit '0da03bb7c4f0eedc98a4e97a90ef06e77761add8':

Change-Id: I1f3b8a5d25254b7c3b337cb55efca67e5621f757