Merge "Merge "Add UI type on selected event" into tm-dev am: afdd611f am: 50bde0ec" into tm-d1-dev-plus-aosp am: 01de68b0 am: 6e59c250

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



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