Merge "Track add of RuntimeService in system server" am: 3350a79438 am: f660386952
am: 5ff6235136

Change-Id: I816f9253ed32d34650368b531fded7379bd24931