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

Change-Id: I9ff24304c580bba54afe9b0f4bc4394d513c04cf