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

Change-Id: I100fc666ba08ceec6f85e7f8ecb82cdf787e3ee0