Merge "Ensure dim changes are in same transaction; do not wait for token to...

Merge "Ensure dim changes are in same transaction; do not wait for token to change visibility" into udc-dev am: 214d2fd3 am: bcdca7c9 am: dd47c1ac am: 12880117

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



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