Android CTS 6.0 release 3
Merge "Revert "Cts test fix for shortcode 48000" BUG: 26714654" into marshmallow-cts-release