Merge changes from topic "readonly_generic_ramdisk" am: 696882455b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id57384c385a6d0bc931caf1054812a469daa9ed0