Merge "Trigger re-inflate when sensitive setting changes" into tm-dev am:...

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

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



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