[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 948d9f4dc2 -s ours am: 28d587a336 -s ours

am skip reason: Merged-In I9ed0d234498f34217ed39bcad95e987921ee872f with SHA-1 9b821f215a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/1741412

Change-Id: I44f17dca0fb797694d33e11563ba9d7671941a4e