Merge "Avoid crash when resetting defaults." into tm-dev am: 637f7d57b3 am: da84fbcd4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17261668 Change-Id: I187e9359241a99850de8e529943d0b529fc82127 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: