Merge "Check query permission and populate attributes" into udc-dev am: fbb43217

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



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