Merge "Add 'am start-foreground-service' shell command" into oc-dev am: 1157116b0c
am: 86ca9f3826

Change-Id: I2eda3f0d4e4e841b0a391c6734069df1f45ee1c7