Merge "Merge \\"Restrict hotspot qs tile to admin user\\" into nyc-dev am: ba568a46e6 am: 045fd29c75" into nyc-mr1-dev-plus-aosp