Merge "Merge "Merge "AdaptivePlaybackTest: use toString() instead of constructing string" into nougat-mr1-cts-dev am: 8c7edb8094" into oreo-cts-dev am: c8b75c7871" into oreo-mr1-cts-dev
am: 4fa7f6b49b

Change-Id: Ib383b6848e12fa50626886a68f9b6225107a8106