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

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



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