Merge "Merge "Change cancel button type to skip for SUW" into qt-r1-dev am:...
Merge "Merge "Change cancel button type to skip for SUW" into qt-r1-dev am: ff01d52d am: 006edb1f" into qt-qpr1-dev-plus-aosp
am: fce2b7b7
Change-Id: I583bc7effddf24dce3906f4288a87eeb458c6b66