Merge "[People Service] Catch potential `IllegalArgumentException` in the...

Merge "[People Service] Catch potential `IllegalArgumentException` in the event of a malformed contacts URI" into tm-qpr-dev am: a4845f10 am: 20a2bad6 am: e64cab5d am: 1c321b5b

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



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