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

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

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