Merge "Ensure Binder in-calls to UiModeManagerService are guarded." into jb-mr1-dev