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

Merge "Update the activity current config only if it is reported" into tm-qpr-dev am: 5a9a25e8 am: ffd0aa81

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



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