Merge "Merge "Basedir of a bundled app is added to the permitted paths" into pi-dev am: 7df104c4bb" into pi-dev-plus-aosp