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: 9f83622e

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



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