Merge "Add method for adding expansion listener without firing event" into...

Merge "Add method for adding expansion listener without firing event" into udc-dev am: 38d07cba am: 74533e4f

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



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