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: 0497eab3

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



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