[conflict] Merge "Adding tests for ProviderRegistryGetSession" into udc-dev...

[conflict] Merge "Adding tests for ProviderRegistryGetSession" into udc-dev am: e9a096d2 am: c76ef54a

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



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