Merge "Add IMMS#getCurrentImeUserId() to reduce inter-class dependencies" into main