Merge "Verify if overlay exists before applying it" into sc-dev am: d9c8cc67 am: 5d7d36a8 am: 57b212f1

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

Change-Id: I4195da6c3eb40b9dd66c181d9a60b270c63bef3c