Merge "Suppress AID log on adb logcat" am: e72aecb655
am: 3acdcfda75

Change-Id: I3fb09ecad76a932bbbbcb25a04b59376a629f723