Merge "Improve some External Storage Notification texts on TVs" am: 894c63654d am: ce25438e38 am: 68fb171ec4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621095

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75a4d560967ec4d6486b26a9bf43da60cb90f498