Merge "Fix a anr bug caused by sendFinishedSignal logical error" am: 77bee3b429 am: 9d5bddcded
am: 251baedfaf

Change-Id: I34210fcd813c2118f0fa4814884b4adadacc415f