Merge "Check for target watch in StatusBarManagerTest" am: de1a4efb71 am: 604b281ef5 am: e385e0285c

Original change: https://android-review.googlesource.com/c/platform/cts/+/1442675

Change-Id: I086c0bc7c9f3e66b77bd6e33bf85dfd3450c17a0