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

Change-Id: Ia32040fc0ab5e7ad5cb351e97bd00c8909a44b76