Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82 am: 465363a312

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

Change-Id: Ieb1bf012ee0f735dcfc4d579eee9fc587bfbdbe1