Merge QQ3A.200805.001 am: 07183ae1a3

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

Change-Id: I3cc827c41970d41d2c1a4abbe66353b90cefa5a3