Fixes failing CustomizationProviderTest. am: 3528f21216 am: 19762ee362

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

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