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
Change-Id: Id5ef5135f0ee08c6dcea614f324c3946f17f8880