Merge "remove clatd.conf which is no longer required by clat daemon" am:...

Merge "remove clatd.conf which is no longer required by clat daemon" am: 5638065f am: 0208ce53 am: 150dcadc am: f06cae8d

Original change: https://android-review.googlesource.com/c/platform/build/+/1172552

Change-Id: I2238aa0cc3cf934ab4e72fc4e956fe587754c2b2