[automerger skipped] Merge RQ2A.210305.007 into stage. am: 7452f30365 -s ours am: 5771c996e2

Original change: https://googleplex-android-review.googlesource.com/c/device/google/redbull/+/13724595

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9620e7e8b625d6e91b0bad48e24be03a104dd1e