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

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

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