[automerger skipped] Merge "Log only a summary 'Found stale backup journal' message." am: 00cf543f53 am: 24b9cf1e8f -s ours
am skip reason: Change-Id Ia1343e4cea31feb1eba9da561d20736eb5df0a14 with SHA-1 4b4e781943 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371500
Change-Id: I34d89d1e0618f74da8ef248dec02a9fd5d9ffe2b
This commit is contained in: