Merge "Use a separated Configuration instance to save the last state" into...

Merge "Use a separated Configuration instance to save the last state" into udc-dev am: 6a1a8824 am: d0a04649

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



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