Merge "Disable activity process config override for certain display-based services." into rvc-dev am: 3b145e0b19

Change-Id: I51f9b25e72631a5a9db7405410e0ad89c3b8832d