Merge "Apply transaction before calling onFinish" into udc-dev am: 766485be am: 06a0f1e4 am: 177a18c2 am: 8e549782

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



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