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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d783bfddbcd307b35bd1f6031dc807ade2d0f9b