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: I410c3ead357194ed7a1fa043c371237336e494a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>