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: 9626e7ea" into rvc-d1-dev-plus-aosp am: f42df95b

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

Change-Id: I54a09785472c3d2865959bf5c230af0e58a3efc0