Merge "Fix CTS failure for waterfall device" am: 816e6b43aa am: 734475d8de

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

Change-Id: Ia06667eb4af6c7abae558384b647783be25f580d