Merge "Merge "Merge "Fix for testOnCannedTextResponsesLoaded" into marshmallow-cts-dev am: 3f7a9a92dd" into nougat-cts-dev am: 728b6f4dc7" into nougat-mr1-cts-dev