Merge "Make system_server profilable on user." into rvc-dev am: 4b500ced32 am: 852c74a9ec

Change-Id: Ia6fb079e4a391d0ee93e644a5c7446a36b46000c