Merge "Collecting query framework exception and origin" into udc-dev am: 90d2c471

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



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