[automerger skipped] Merge "Log only a summary 'Found stale backup journal'...

[automerger skipped] Merge "Log only a summary 'Found stale backup journal' message." am: 00cf543f am: 24b9cf1e -s ours am: a59f84b5 -s ours am: 6593f7c9 -s ours am: ca0077f7 -s ours

am skip reason: Change-Id Ia1343e4cea31feb1eba9da561d20736eb5df0a14 with SHA-1 4b4e7819 is in history

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

Change-Id: I5b461f9d21a4432b6e32ac86283861e55a603ddd