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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6989361f1dae72cb94d6e6cf6144ae61cb80c328