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
am: 6698f10967

Change-Id: I3155c2f04706b33bd0da88d150f599be7c18c8f5