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

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

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