Merge "Allow Bluetooth CAP_SYS_NICE" am: ebc94ecac9
am: dedc04978e

Change-Id: I5fa80631fe566771525a94c54d8cbbe543b783e0