Fix backup and restore for default browser app. am: 8658bbe3

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



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