Merge "Update the API for getting AndroidManifest.xml info" into main