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-qpr-dev am: e154a066 am: 9a9bc4a6

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



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