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

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



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