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

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

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