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

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

Change-Id: Ie60ca2003fd4a940d09b4e6964295ba3567021d2