Merge "Suppress AID log on adb logcat" into pi-dev
am: 96e843bbcc

Change-Id: I7c99d56eccc07b9c3ceec7e2da05132a7d4727c5