Merge "Add a flag for rounded box charging ripple." into tm-qpr-dev am: 30093d74

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



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