Merge "Apply scrollable to app pinning text area" am: 7f3a7daa am: b3deb44a am: 7cdabf73

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae7b4aef7622ed1e7c975bcfe0b2bfe7f4c21295