Merge "Fix test for wear bugreport options" am: 473007c4 am: c1dc0371 am:...

Merge "Fix test for wear bugreport options" am: 473007c4 am: c1dc0371 am: 29d0b83d am: 2ad9025b am: dc5c5dee

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2521316



Change-Id: I87cf767449c5d330f765a0ccbe76fcfb2c350f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>