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

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



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