Merge "Fix cts failure on PinnedStackTests for waterfall" am: bd5819e51b am: 1b41f941c6 am: 6b66fa1904 am: 7e96359664

Original change: https://android-review.googlesource.com/c/platform/cts/+/1479649

Change-Id: I50ffc970d7e0265ca662c718dae2d450db448a2a