Merge "Trigger re-inflate when sensitive setting changes" into tm-dev am: 8df521fb am: 526d9056

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



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