Merge "Recheck the condition before really killing" am: f24ac738 am:...

Merge "Recheck the condition before really killing" am: f24ac738 am: c2cbdc70 am: 7c944d37 am: e90bb605

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2121361



Change-Id: Iba973612f5abc32b539375f53b330cd54f35acd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>