Merge "Merge "Change cancel button type to skip for SUW" into qt-r1-dev am: ff01d52d50
am: 006edb1f6d" into qt-qpr1-dev-plus-aosp
am: fce2b7b76b
Change-Id: I583bc7effddf24dce3906f4288a87eeb458c6b66
This commit is contained in: