[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: 9b821f215a -s ours

am skip reason: Merged-In Ib5a7173764ba390f9aaaf38dd8bbbbac6bb028a8 with SHA-1 c7f4a93893 is already in history

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

Change-Id: I3fdab508bc547c8caf82d9833e0a418a2f315375