Merge QQ3A.200805.001 am: 88e41c98d2

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

Change-Id: I0bb018e5114bd742873c6728e845631299b8eb62