Merge "Update launch policy state when finishing transient launch" into...

Merge "Update launch policy state when finishing transient launch" into udc-dev am: eb42b383 am: 85ff2df8

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



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