Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328" into oc-dev-plus-aosp
am: 61ce9b3bad

Change-Id: Ib70ec4ba0b92814e4295b3875b6e88d994e3c788