Merge "Fix incorrect cache checking of string config values" am: ad55c3468b am: 473917aa5b

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

Change-Id: I18930572871e1bb372c6f601b691d80420f96b46