DO NOT MERGE - Merge ab/7272582 am: 9e03a78757

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

Change-Id: Ib5a7173764ba390f9aaaf38dd8bbbbac6bb028a8