tree a3b2911582da7b6b88135672de48359aff495425
parent 66b0c31336bfcfca06d1b3280b84feb3c810a992
author William Sun <williamsun@google.com> 1572908196 -0800
committer Kazuhiro Inaba <kinaba@google.com> 1596124959 +0000

Fix the Instant Apps notification test for non-CN devices. Previously, ag/9021279 introduced two issues, and this commit fixes them:

1) The string for the non-chinese test case had a line of instructions removed. That line of text is now restored.
2) Part of the check for "isNoGooglePlayStore" included checking the system property for "ro.com.google.rmsversion" - however, this check can return null even for devices with Google Play Store, so its usage in "isNoGooglePlayStore" is removed

Test: m -j32 CtsVerifier
      m -j32 CtsVerifierInstantApp
      adb install -r -g CtsVerifier.apk
      adb install -r --instant CtsVerifierInstantApp.apk
      Launch CtsVerifier, Instant Apps Notification Test

Bug: 143173196
Bug: 159355574
Change-Id: I216f23a1a0e2865d0388fd80d8b4f1ecbce2dbb4
(cherry picked from commit 435a3aa6906d5bc9e4751277282c271b2e5510a3)