Merge "Add UI type on selected event" into tm-dev am: afdd611f

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



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