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 am: 1db6b429

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



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