[automerger skipped] Merge "Fix CTS failure for waterfall device" am:...

[automerger skipped] Merge "Fix CTS failure for waterfall device" am: 816e6b43 am: 734475d8 am: 27475331 -s ours am: 257735b0 -s ours

am skip reason: Merged-In If3001b13b48b1e3124b9bd898ab740a2d3025df0 with SHA-1 59a7b14c is already in history

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

Change-Id: I7029c366f59e589f7b40d16b6a32657348112cd3