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

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

Change-Id: Ie4c87610b2b24037035257caa1f25aaa13c35997