Merge "Convert libaudiopolicyservice from Android.mk to Android.bp"