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

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



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