[automerger skipped] Merge "Trigger re-inflation when configuration changed" into udc-dev am: 07937a00 am: 5a04dab6 -s ours

am skip reason: Merged-In Id3f120dbdd1afb3863a85f105059beee1ec460da with SHA-1 922b1a2d is already in history

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



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