Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423

Change-Id: Ieadee7a7c884500a836b5f118fce9b649e9e179b