Merge "Avoid timestamp update when data is kept on dump" into rvc-dev am: 0017b441 am: 9626e7ea

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

Change-Id: I3fc5383c108c84070221111a50615fa94d950679