tree 3a0e35d751a94716de0020fa4fa2d67434ed753a
parent e16c5689e6a24ac13b5b9ed9b7f23a4439827e22
parent 1db88426aae46440fef90fc6e8d8781a51828b11
author Winson Chung <winsonc@google.com> 1563999581 -0700
committer android-build-merger <android-build-merger@google.com> 1563999581 -0700

[automerger skipped] Copy resume callbacks list prior to making callbacks am: a8971c1462 am: e5e34a7c91 -s ours
am: 1db88426aa -s ours
am skip reason: change_id I6690ab0695bb73f11bf343fb41e9fc86b4afec1b with SHA1 a8971c1462 is in history

Change-Id: Ifca05638fc67ae4be8630f638b150c3abf6c4f60