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

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



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