Merge "Add an optional extra field description for ACTION_CHANGE_DEFAULT" am: 2b65ebc340 am: 8f7978d676

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

Change-Id: I295b0965a6949ebaa377447b892aa1a776f86965