Merge "Avoid unnecessary binder calls from getDeviceIdForDisplayId & getDevicePolicy" into main