Merge "Make system_server profilable on user." into rvc-dev am: 4b500ced am: 852c74a9 am: 0a8807ac Change-Id: I5fbcef5cbd4756d93ee24ea0e98673c342a179d3