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 am: 0826307c

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



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