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

Change-Id: I72b0c0bff1dc8925c9687c1b2c39ab27e9c2d428