Merge "Remove qmuxd from init scripts and sepolicy" into stage-aosp-master