Merge "Double-click notification on newer watch sysui version." into stage-aosp-pi-cts-dev