Merge "Add overrides support for snapshots" am: f6e13d426b

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

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