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

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



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