Merge "Incorporate API feedback: extract text accessories" into tm-dev am: 51f6839078

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

Change-Id: Ie24dc742e298caee9bef80cabc6883500b22e7bf