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

Change-Id: I2919b516deaee52fc19ec82708a9249a263e95b7