[automerger skipped] DO NOT MERGE - Merge RQ1A.201205.011 am: bbf8425a8c -s ours

am skip reason: skipped by user delphij

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

Change-Id: If941a99d098436c8f49385682826256332c54016