automerge: c43613b
* commit 'c43613becf0146a0d54ff15f5ca024d759c43290':
Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION
automerge: c43613b
* commit 'c43613becf0146a0d54ff15f5ca024d759c43290':
Fix issue #15828903: Intent.parseUri allows call to FLAG_GRANT_*_URI_PERMISSION