Merge "Unset activity type for process level configuration" into rvc-qpr-dev am: 25bfb826

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12360930

Change-Id: I13ef4042627670ab0f4f7d0af5e716764f960d93