Merge "Prevent activity config override for system processes." into rvc-dev am: c47c4c0e13 am: 030c39f888

Change-Id: I4b988ad9b338c95489e9fadb9d75a1607400fee2