Merge "Always use the latest CLC for system server" am: c627177587 am: 6c7dcfeccc am: 8900f912e5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b10842a46df176c2ff0ff8f8a77dd5be0cb41f0