Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328 am: 19ec8e7bcf" into oc-dr1-dev-plus-aosp
am: 007000c37a

Change-Id: I7385a4695301c8d8f7aaf583cd4efb2051470d36