Merge changes from topic "lpdump-snapshots" into main am: f489314dec am: 245da0124a

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2658819

Change-Id: I6394c35e31e6f82e76b7f5af676da2e1d0e78b59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>