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 am: 8589c1c3

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



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