Merge "Add post fork hook for System Server"
am: f2a342b3ab

Change-Id: Icbc2f2b319be183c638ab09116d6550fff89dee9