Merge "fix clatd permissions try 3 - this time for GSI" am: 02a6d74b am:...

Merge "fix clatd permissions try 3 - this time for GSI" am: 02a6d74b am: cbb2e415 am: d585e683 am: 751209de

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



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