Merge "Fix RippleFinished being called on first draw." into tm-qpr-dev am: 801a4b98a3 am: 3f7a9f81c0

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

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