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