Merge "Merge "Init MidiService once system user gets unlocked." into nyc-dev...
Merge "Merge "Init MidiService once system user gets unlocked." into nyc-dev am: da08abed am: 4015b12b" into nyc-mr1-dev-plus-aosp
am: 611c2c53
* commit '611c2c53':
Change-Id: I7d422119e1f8db9c4098eb4449a2ff8f12642658