Merge "Remove old quickshare chip when adding a new one" into tm-qpr-dev am:...

Merge "Remove old quickshare chip when adding a new one" into tm-qpr-dev am: 2e5bc091 am: 078a1bdb

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



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