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: 55ac39de

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



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