Merge "Only allow completion callback to be run once for PIs" into sc-qpr1-dev am: b53041d1eb am: 0a0cb88bba am: 8fe1134b41

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

Change-Id: I6054208b70a830959bcfbb7ef22992cf9f51d245