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

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

Change-Id: Ic6533b4be2a0249f49b00fe1a254009cfa690dbd