Merge "Fix CTS failure for waterfall device" into sc-v2-dev am: 990528e9be am: 712b93d725

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

Change-Id: I22bccf99c4b6e43823040cb8683a5626cde0f525