Merge "overlayfs: Mount overlay with context= fs_options if original mount has...

Merge "overlayfs: Mount overlay with context= fs_options if original mount has it" am: 3ae02344 am: ac5a9f0b am: 7e4b74bf

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



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