Merge "Fixing the rapid activity launch count always increase" into udc-dev...

Merge "Fixing the rapid activity launch count always increase" into udc-dev am: 218a3807 am: 818e4fc8

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



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