Merge "Test fails on internal. Move to postsubmit." am: 72e91d134f

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

Change-Id: Ic25bd33b55c129d0f36c25cd48ff79bafc015638