Merge "Transitions - Better dozing/aod support" into tm-qpr-dev am: c36131f6 am: bc910d8a

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



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