Merge "Add keep annotations to KeyButtonRipple" into sc-v2-dev am: 5e11d0b9f6 am: c2d905637f

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

Change-Id: I82ea942b0acf52199f390f9407b8bccb9cdc8508