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

Change-Id: I482d925766a124beea9c9047071eca021cea3ba4