Merge "Allow bootjars in system_ext." am: 6abe4fb0a7 am: 4ab8f542e9

Change-Id: I470d4f21af77265926ceb3a9b2bcfd08809e813b