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

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

Change-Id: Iac107601cffcd37a403ae3604715d7cfe0dda9e4