Merge "Apply scrollable to app pinning text area" am: 7f3a7daaf5 am: b3deb44a56

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I150aa1b7a8b19efd1153530684b0e0ad4ece4312