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

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

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