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 am: 60c16d73 am: bbadfba0

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



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