Merge "Apply transaction before calling onFinish" into udc-dev am: 766485be am: 06a0f1e4 am: 075723ad am: 7e4c93ef

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



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