Merge "Ignore ASHA hisyncId grouping if the device supports CSIP" into udc-qpr-dev am: b30815d38a am: 6eea5f95b3

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

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