Merge "Allow multiple permission sync consent requests" into udc-dev am: e85def5d

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



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