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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d278ac186f9d4814cd1bb0c5185c16a8dd7f026