[automerger skipped] Merge "Finish PIA if UnknownSourcesListener would like to...

[automerger skipped] Merge "Finish PIA if UnknownSourcesListener would like to start a PIA again" into udc-qpr-dev am: dda7ddf4 am: ee5310c4 -s ours

am skip reason: Merged-In Icfce5b79b1cf356015b908f5c3ac44a488707dd7 with SHA-1 03a3b6a4 is already in history

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



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