Merge changes from topics "snapshot_androidmk_suffix", "snapshot_list_module" am: b968be1e69

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I814be4a2501ce4777ae4bb957f0eabd538397ee2