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 am: 7a6e5e0d am: d7af1502

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



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