Merge "Revert "Remove b/149317789 from bugmap"" am: 7d6b8d2a85 am: f55d139b38 am: a909e5034a

Original change: https://android-review.googlesource.com/c/device/google/wahoo/+/1363617

Change-Id: Id359eacefa81c6e8248b119f3e70da145aa9163f