Merge changes from topic "presubmit-am-5e496fe1fd084512823b907cfa9eb903" into sc-qpr1-dev am: e91c72fb32 am: b3353162a5

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

Change-Id: Ie50abda12d4bfe7e7d9341d6e653496c9fd00952