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

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

Change-Id: I9d8b3763134b013ca8f911ed1ec7d864a93d90aa