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

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

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