Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI"""
am: 2f4a8bb534

Change-Id: I3ee8f69b34adca073f2dac31fb2c20b5d387ab10