Merge "Only allow completion callback to be run once for PIs" into sc-qpr1-dev am: b53041d1 am: 6a99d0a3

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

Change-Id: Iba1196790f84c5d4deee49f612ac22b6d287938a