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 am: cea561c3

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



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