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

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

Change-Id: I4b648434a44d9b26082ddba369bafc90b7957c9c