Merge "Move smart chips (if any) before capture more" into tm-dev am:...

Merge "Move smart chips (if any) before capture more" into tm-dev am: 6ff8ee2c am: b6877149 am: a8c561f4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349155



Change-Id: Ic37dd01db02bff066eb63758c7d1901f234d0273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>