Merge "Start AOD transition a frame earlier" into tm-dev am: 42c727df am: df23a643

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



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