Merge "Updating the cached resource configuration if ViewRoot is perserved"...

Merge "Updating the cached resource configuration if ViewRoot is perserved" into tm-qpr-dev am: 0c3a5f85

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



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