[automerger skipped] Merge "Require calls to...

[automerger skipped] Merge "Require calls to BluetoothA2dp#setBufferLengthMillis to pass a non-negative value" am: 63e6017e am: a96f2f62 -s ours am: 6c2f34bb -s ours am: 259625c74b -s ours

am skip reason: Merged-In I3c1d2da1d28a494d8b393c4502521b3f0699adf6 with SHA-1 063511f1 is already in history

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

Change-Id: Idc322adad4d711606ff7427c19f91b546db728e4