Merge "Add overrides support for snapshots" am: f6e13d426b am: f4cbf12fa2 am: 2af0f8ca99

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

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