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

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

Change-Id: Ieef1ccfc59761bbd570c457ef126d7f3489d424f