Merge "Define FLAG_BEACON in android.media.AudioAttributes" into lmp-dev