[automerger skipped] Merge "BtifConfig: Prevent unprotected access to btif config cache" am: 2fb86c63 am: c338e4c4 -s ours

am skip reason: Change-Id If20db2c94cebb538f7c8d5c7c4b4c463dcfc1988 with SHA-1 3bef5003 is in history

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1344237

Change-Id: I0fff9265adb668660047007eb45c511c6be525c7