Merge "Ensure the activity type is set to the activity" into udc-dev am: b255015e am: 211c8077

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



Change-Id: I3dbd9eac4bc337d80805ce40b4bd8873e366128c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>