Merge "Reland “Update the activity current config only if it is reported”"...

Merge "Reland “Update the activity current config only if it is reported”" into tm-qpr-dev am: c6489d3c

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



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