Merge "Minor Copy/Paste overlay UI edits" into tm-dev am: 1c6f7596c2

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

Change-Id: I27bac02ce00d09005877e52091e331260d18768d