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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1590ceef18959ac7cf6da6351072323aec696e6