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

Change-Id: I208e4dbd05496982663ea14d73d6f2872a4a07ab