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