Merge "Add device= in Fstab" into main am: 4dced90f

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



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