Merge "libbinder: Hide AppOpsManager/Service from vendor."