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

Merge "Merge "Avoid timestamp update when data is kept on dump" into rvc-dev am: 0017b441 am: 3046d458 am: 9bea6c7a" into rvc-qpr-dev-plus-aosp am: 21a0fa1f

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

Change-Id: I926b58614b93de6a0ccdc52b1abca1617c7a296e