[automerger skipped] Merge "Don't create a file with empty favorites" into...

[automerger skipped] Merge "Don't create a file with empty favorites" into rvc-qpr-dev am: e7af3e1a am: 60bd9c23 -s ours

am skip reason: Change-Id Ia99b8e98e4f62d8d0c7385c820c645f3aaabe6f3 with SHA-1 9c892d30 is in history

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

Change-Id: Iec1cc4a4f67bae73676895906807e0b3d19baba7