Merge "fix clatd permissions try 3 - this time for GSI" am: 02a6d74b65 am: cbb2e415ea

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2545790

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