Merge "Move A2DP Sink Timeout in line with other profiles" am: 5176a146 am: e3269f7a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2309989



Change-Id: Ib59f8eb6c14e4b84c79b886761451fcdc748a485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>