Merge "Only verify device can suspend if required" into oreo-mr1-cts-dev
am: a4baaf7cc9

Change-Id: Ib6be60fc24cab9ba4492ab426282b2de408ec945