Merge "Merge "Make addExpansionListener not send a change event on add" into...

Merge "Merge "Make addExpansionListener not send a change event on add" into udc-dev am: 79232399 am: 9f80a2c0 am: 57ea205b" into udc-qpr-dev-plus-aosp am: 52ced339

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



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