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

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



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