Merge "Enforce /system module RRO for mainline products" am: c578262e37 am: fc810895ec
am: 86dc21bddf

Change-Id: If26dc880e0bfc4efee96630f02ece8287ce8767a