[automerger skipped] Merge changes from topic "audiotrack start threshold" am: 7a9d8d60 am: 2a4c6ec1 am: 022c080e -s ours

am skip reason: skip tag Change-Id Iae10764130160de2380477134df27c5b139468bc with SHA-1 3c7f47af is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1644227

Change-Id: I145017715df676a0c74a6bb5b7cf44fd65b5b023