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

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



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