[automerger skipped] Merge "3 cases fail in CtsTelecomTestCases" into oreo-mr1-cts-dev
am: 36e23192e1  -s ours

Change-Id: Ibb377f6449809c57eb153d3f11252b758c074b44