Merge "Merge "Add timestamp to ActivityOptions.OnAnimation*Listener" into...

Merge "Merge "Add timestamp to ActivityOptions.OnAnimation*Listener" into tm-dev am: 408b90ff am: 9fdcd1a6" into tm-d1-dev-plus-aosp am: 2306d576 am: c3e26fd7

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



Change-Id: I181c661e217533b10398d8ef33a0540061ccad15
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>