Merge "firmware: fix chre deprecations" am: 4144908fc4 am: f130870810

Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1605453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86a4879d47e5cb511d44806c0e04b18ba5abf802