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

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



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