[automerger skipped] cleanup - config_item_str() am: 2c286b0702 -s ours am: 477b24bcb8 -s ours

am skip reason: Change-Id I1a8f21e55534457718ea58cdab15266b9f232fd3 with SHA-1 606c53fb61 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/android-clat/+/11736243

Change-Id: I0487b66d82879d4f3cbcdbd4306ad938bb2c0061