Merge "Fix Computer and App Streaming Strings" into tm-qpr-dev am: d453c4f6ff am: f084fd5c66

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

Change-Id: I928ba01ac6108ac6c8d966ab582d2da9241d47a2
Signed-off-by: Automerger Merge Worker <[email protected]>