[automerger skipped] Merge "Add the DynamicAndroid Service" am: 0b2057db02 am: 683251a1e2
am: 1906271db6 -s ours
am skip reason: change_id I2e54b6b71fac4a4c5a9c9c25ce6bdac74cddcfb7 with SHA1 0a94764738 is in history

Change-Id: Ic935b6ac02a917937b4ef2d38827be8e6590f7c7