[automerger skipped] Merge "Apply transaction before calling onFinish" into udc-dev am: b594f7e0 -s ours

am skip reason: Merged-In I696a38fb6ab4d702127b530cd4a20492b5ad09aa with SHA-1 4ff27cb7 is already in history

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



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