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

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

Change-Id: Ia2d8822d0230fd93893399bc5a61c9af7a355139