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

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

Change-Id: Idb1d7987211f501390b024d6f4f084e79e1e1cc5