Merge "Don't create a file with empty favorites" into rvc-qpr-dev am: e7af3e1a

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

Change-Id: I37dea759f6b173b634d5cfb19c368361c1c37008