Fix freeze issue after launch single app am: 7f05e1a9 am: 13180a64 am:...

Fix freeze issue after launch single app am: 7f05e1a9 am: 13180a64 am: 134b8a89 am: 20524c1e

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



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