[automerger skipped] Merge "AudioService: increase audio mode timeout." into...

[automerger skipped] Merge "AudioService: increase audio mode timeout." into rvc-qpr-dev am: 33229d78 am: 3a49946a -s ours

am skip reason: Change-Id Ic1efc496931a5ab5fb9a28fc918dba1cf66a89df with SHA-1 b9088b22 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11903f4415b5dd444a17adced5f0b0c4c467022a