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: I110e256b7586b182d56b07585595322f6b8e6b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>