Merge "Fixing the default values for pending intent at...

Merge "Fixing the default values for pending intent at LocationPendingIntentTransport." into udc-dev am: f7de5aa1 am: a55af893

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



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