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: 891ac372 am: 96ebfff4 am: 06cc7b82

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



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