Merge "Support for recovery snapshot." am: 91d34ce25e am: fd6fe9e768 am: 0eed0ec254

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1d221a5576b29cdeb882ce2ae706eeb277d9084