Merge "Fix double ripple when the device is docked." into tm-qpr-dev am: 8b94cff8

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



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