[automerger skipped] Merge "Replace HashMap with ArrayMap for services" am: f0d921c41a -s ours
am: e15d29b2ad -s ours
am skip reason: change_id I092c6816afba77fde4195c68a211804d4a561b77 with SHA1 1901a5b483 is in history

Change-Id: I8e068a5b64aac08e8a933c7fed79f39322554990