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: 941c7df3 am: c7917475

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



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