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

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

Change-Id: Ifd4429f3175eacf2a809cb493864b74ea8c2d988