Android 7.1.2 Release 5 (N2G47J)
fixing a race condition on MsgTask::destroy()
am: 4eda8e1eab

Change-Id: I454c2dcb8a17c43f8e42edd326b950cd8173eac1