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