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

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

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