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: 4f497ad2

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



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