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

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

Change-Id: I64d55e8c48d32c899b364bfbbe74d115e4bb0593