[automerger skipped] Merge "Do not use isResumed()" am: b99211257a am: 1722f5bd03 am: a6ba2a9d5e
am: 6e33abd8fc -s ours
am skip reason: change_id I5eab0b1575a64a2cbbb441274e270bf5e6017dc4 with SHA1 32e8b2ade0 is in history

Change-Id: I1d4f6f673ceea22bf67b16bea07308e35bd3f2df