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

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

Change-Id: Ia8749bb7d273af93c310a10e101511ec2db0fbd7