Merge "docs: Fix outdated sample code in Context#getExternalFilesDir. Test: make ds-docs am: f767eb4aa9 am: cc4b685d3e" into qt-r1-dev-plus-aosp
am: 69343ec477

Change-Id: I8f2c268e9504630f24fdd96e55027dd3483971b2