Merge "Do not re-define remote bugreport constants defined in DevicePolicyManager" into nyc-dev