Merge "Add aidl method for removing individual sensor privacy listener" into sc-dev