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

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



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