Merge "Move smart chips (if any) before capture more" into tm-dev am: 6ff8ee2c am: 941c7df3 am: 10559b30

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



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