[automerger skipped] Merge "Fix test for wear bugreport options" am:...

[automerger skipped] Merge "Fix test for wear bugreport options" am: 473007c4 am: c1dc0371 am: 29d0b83d am: 2ad9025b am: 838952a4 -s ours

am skip reason: Merged-In Ia9423adc1a4c7f400f9bcd6a3969e66e2bd27ed4 with SHA-1 da7d670d is already in history

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



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