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: cdedabe2 am: 68a631e3 am: 606051d1

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



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