Merge "Defer calling the stack task removed callbacks. am: 6c8217ab30 am: d5fada7253" into nyc-mr1-dev-plus-aosp
am: 19e8f51d7e
* commit '19e8f51d7eed5bf2f640cb8df4492f146da9d849':
Change-Id: I4205e5b4ba5beda9c3e97fbadbff6eaec62a6843
This commit is contained in: