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

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

Change-Id: Iacb90c3d742ed37f36fd9c775102536d4ec8df40