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

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

Change-Id: Ib61966b696836e071820879ea60065ce77a0c1e2