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: Ifb1e3514bbab1ff39eaa60b7911a590cbe58a877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>