[automerger skipped] cleanup - config_item_str() am: 2c286b0702 am: 8b320646cf -s ours

am skip reason: Change-Id I1a8f21e55534457718ea58cdab15266b9f232fd3 with SHA-1 2c286b0702 is in history

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

Change-Id: I759c3be9fac2a09bf6ab6ef45c5c0a9ed74c9e20