Merge "Revert "Update the activity current config only if it is reported""...

Merge "Revert "Update the activity current config only if it is reported"" into tm-qpr-dev am: 362a8f75

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



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