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

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



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