[automerger skipped] Merge "Inject dependencies into TelephonyRegistry" am:...
[automerger skipped] Merge "Inject dependencies into TelephonyRegistry" am: f5d33a6c am: ed57becc -s ours
am skip reason: Change-Id Ib311e439a6dcedacdda144e7ee2c45652d966404 with SHA-1 05f4069d is in history
Change-Id: I8bfeb1abdcf79c1c1e7947b36e84a827daf3b5c0