Merge "Merge "Suppress AID log on adb logcat" am: e72aecb655 am: 3acdcfda75" into pi-dev-plus-aosp
am: 2a25678037

Change-Id: I38379b60afbc0c75ecd4126ab3a4ae2c2bec6093