Merge "Avoid crash when resetting defaults." into tm-dev am: 637f7d57

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



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