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

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

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