Merge "Revert "Updating pre/post submit tests"" am: 18d7a90923 am: e3f8aa3a61

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

Change-Id: I254acf5ab74ad87b9f6fe48960eceb081da807e5