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

Change-Id: I31cd40ec31485fcada2e133e5fdd05db75f67b1b