Merge "Merge "Update listeners of stashed state after add" into udc-qpr-dev...

Merge "Merge "Update listeners of stashed state after add" into udc-qpr-dev am: d8b36828" into udc-qpr-dev-plus-aosp am: 656dc387

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



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