[automerger skipped] Merge "Trigger re-inflation when configuration changed"...

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

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

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



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