Merge partner/android-gs-pixel-mainline into partner/android-gs-pixel-5.10-stabilization

* partner/android-gs-pixel-mainline:
  Merge branch 'whitechapel' into android-gs-pixel-mainline
  edgetpu: abrolhos: modify cooling device return value
  Merge branch 'whitechapel' into android-gs-pixel-mainline

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 170682696
Change-Id: I0ff099ef65c696233536dd92ee1007f5c26b7411