Merge "Don't start clatd if disabled by vendor property." am: a517079da0 am: c147019ab2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I333fba0c9bca40f0cd60d042b4c6ed82e72abaa9