Merge "verify clat related permissions during boot" am: 8434684385 am: 3ac51c63a3 am: 193be02975

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2510196

Change-Id: Ic5511bda3acd53a0f00520a2af6026017a10155a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>