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

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

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