Merge "Apply transaction before calling onFinish" into udc-dev am: 766485be am: cc2be16b am: 8932196c am: 30168b35

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



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