Merge changes from topics "snapshot_androidmk_suffix", "snapshot_list_module" am: b968be1e69 am: cffc2fa0a2 am: 4f8ed9f2dd

Original change: https://android-review.googlesource.com/c/platform/development/+/1563533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I983b329d5395bd103392f0c368d0d6f962a47cf3