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

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

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