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

Merge "Fixing the default values for pending intent at LocationPendingIntentTransport." into tm-qpr-dev am: 37bf03e2 am: c2e43802 am: e438a4da am: 4bceb30d

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



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