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

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



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