Merge "Prevents system busy or restarted due to rapid activity launch loop"...

Merge "Prevents system busy or restarted due to rapid activity launch loop" into udc-dev am: 6856c694

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



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