Merge "Fix for Cannot load etc/recovery.fstab when doing OTA upgrade" am:...

Merge "Fix for Cannot load etc/recovery.fstab when doing OTA upgrade" am: f4753d1c am: f1762460 am: 6d867d53 am: c76533b6

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2153356



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