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

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

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