[automerger skipped] Merge "Skip reading config file that does not exist" into...

[automerger skipped] Merge "Skip reading config file that does not exist" into tm-qpr-dev am: a2c6c3ac am: caf9e106 -s ours am: f12cc3a2 -s ours

am skip reason: Merged-In I64a62c4aa66ac045aa4b1ddf1ad2e51d7bf4ca5b with SHA-1 15942b75 is already in history

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



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