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 am: ee96d2d6

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



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