Merge "Fix CS external dependencies on CarrierDefaultApp" am: 25be9509b8 am: e51271ca2f am: 7f507fe7fe

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

Change-Id: Ic31b153806395cbec7b36227b973a080b66382c3