[automerger skipped] Merge "AudioTrack: Add...

[automerger skipped] Merge "AudioTrack: Add TunerConfiguration.CONTENT_ID_NONE" am: 1e21d853 am: caff316b am: 1745c7a1 -s ours

am skip reason: Change-Id I679c809ee8834c5a608243c353bc3a76ec55243c with SHA-1 0ac9fb2e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcf7daab17393cc46133bc316ba3a449aa46b741