Merge "sensord: change the default axis policy from DEVICE_ORIENTED to DISPLAY_ORIENT...