Merge "Add ServiceHolder for AudioPolicy" into main