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

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



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