Merge "Merge "Fix CTS verifier: TELEPHONY cases not scrollable" into oreo-cts-dev am: 0b565e2956"