[automerger skipped] Merge "Trigger re-inflate when sensitive setting changes"...

[automerger skipped] Merge "Trigger re-inflate when sensitive setting changes" into tm-dev am: 8df521fb am: 526d9056 -s ours

am skip reason: Merged-In I393ae6c465b2e86a3dbb88414f784fe871390f38 with SHA-1 f3fdfa88 is already in history

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



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