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

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

Change-Id: Ie3e4853340b54a09bbc82c824e8a07422a831d01