Merge "Expose getDisplayUserRotation in aidl" into main