Merge "Test fails on internal. Move to postsubmit." am: 72e91d134f am: 16c199a653 am: 26afdce91e am: 066b64ccdf

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1404829

Change-Id: I7db85ff06d8f40710c46c5d26db7ca44917e253e