[automerger skipped] Merge "Ensure configuration is not null." into tm-qpr-dev...

[automerger skipped] Merge "Ensure configuration is not null." into tm-qpr-dev am: 31d3853e am: 2ea3255b -s ours

am skip reason: Merged-In I566f9006c85c386335cc8d37cb1807fa0b8f9c5b with SHA-1 aa727ba6 is already in history

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



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