Merge "Merge "Fix for a test broken due to removing logcat msgs" into rvc-dev...
Merge "Merge "Fix for a test broken due to removing logcat msgs" into rvc-dev am: 621db815 am: d21e6f3e" into rvc-d1-dev-plus-aosp am: 99d31ec2 am: a20937dc
Change-Id: Ie6d6f038cb8705d21d7bd368e57935765be55170