Merge SQ1D.211205.017. am: 605793b34f

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/1930718

Change-Id: Ic579e5034b4dcb9b28a1abcbe4f8228708f8a5a4