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

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



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