Merge "Add timestamp to ActivityOptions.OnAnimation*Listener" into tm-dev am: 408b90ff am: 69ca04c6 am: 3a0ce754 am: 91e65c5e

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



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