Merge "Fix test for wear bugreport options" am: 473007c459 am: c1dc037157 am: 29d0b83d16

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

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