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: a7125805
* commit 'a7125805':
Change-Id: I09ef8122b43e626c8a3b48f0402bfc95d1238863