Make OpenAppCold/Warm tests compatible with AOSP

Test: atest FlickerTests
Change-Id: Ib1071b125597e73a5c72e22e9107ae4d29f5cb7f
2 files changed