Merge "Make addExpansionListener not send a change event on add" into udc-dev am: 79232399 am: b848f429 am: cd73ec23

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



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