[automerger skipped] DO NOT MERGE -  Mark RQ2A.210105.001 as merged. am: a5517e537e -s ours

am skip reason: Merged-In I6b82af520bf0324d990b5a540e12ac0913b7c8d8 with SHA-1 8de436ae60 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/chre/+/1699298

Change-Id: I95fb9752078546a3905bcc9fe3f4d7b461b5337e