Merge "Remove EXTRA_KEY_TYPE intent data" am: d106ae0f82
am: 465363a312
am: b79a82260c
am: 98ac6a6c01
am: b28d6c6c76
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2031423 Change-Id: I61aac53cb4f668db3f092d8379bbf358ed3f5774
This commit is contained in: