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

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

Change-Id: I8ee43c359a97d1dd284946506a37d33572db9a49