tree 3a0e35d751a94716de0020fa4fa2d67434ed753a
parent 760edb99050543da82d241c082827dd6c1a01cf5
parent 964ade18718fe45fb39778cee0d0698bd850cf3d
author Winson Chung <winsonc@google.com> 1563999116 -0700
committer android-build-merger <android-build-merger@google.com> 1563999116 -0700

[automerger skipped] Copy resume callbacks list prior to making callbacks am: a8971c1462 -s ours am: 4f68901b5b -s ours
am: 964ade1871 -s ours
am skip reason: change_id I6690ab0695bb73f11bf343fb41e9fc86b4afec1b with SHA1 940b0ac015 is in history

Change-Id: Ie74d0866695182c416c26239778da0f9c7a08c32