Merge "Finish PIA if UnknownSourcesListener would like to start a PIA again" into udc-qpr-dev am: dda7ddf4d1

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

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