Merge "Correctly apply transaction on the end of veiled resize." into udc-dev am: 1f4ed1eca3 am: c1a6e08400

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

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