Merge "Fix wear CTS fail in testBroadcastNotReceivedForDifferentLauncher. am: b5651e9580 am: 11a0b50881 am: 30f73404a8 am: 101950ab17" into oc-mr1-dev-plus-aosp
am: 84d3953ce4

Change-Id: Icc31fb97adc3c0dbe4166aeb4295aa0de7ac599f