[automerger skipped] Merge "Fixes flicker of not applying initial transform to leash" into tm-qpr-dev am: beaea97e -s ours am: d82a5afa -s ours am: 08787ffb -s ours am: 418271dd -s ours

am skip reason: Merged-In I11cc741cac0147b080985351b8e66d53b370289c with SHA-1 f91f797e is already in history

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



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