Merge "DO NOT MERGE: test app must be streamed" into nougat-cts-dev am: 6638d3a5a5  -s ours am: f540af9bb2 am: a9d298895f
am: 487db1dcfb

Change-Id: I248b44cc2af06db4e79ef158e42f4b3de0b62486