Merge "Merge "[QS] Update long-press tooltip text" into pi-dev am: 1fbe7081ea" into pi-dev-plus-aosp
am: 6209297cac

Change-Id: Icca6fc8ef92e396b8539154c9f24eabcc1d9c1aa