Merge "Updating pre/post submit tests" am: bf3ed6ca9c am: 00089f0440 am: b1de7a1e54

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

Change-Id: Icfcfecdc3efdd7f9f1af4bd5c8726e3d07830d58