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: 08387124 am: 743bb86c

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



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