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

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

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

Change-Id: Ibb08eebbfa0eeb3f09fa838407c0886f59ff473d