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

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

Change-Id: I438549b97f7125eb089974221a0ffda14f22787f