Merge "Only update the cached state if the value changed" into tm-qpr-dev am:...

Merge "Only update the cached state if the value changed" into tm-qpr-dev am: dc0b0fd9 am: 4e4c869b

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



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