[automerger skipped] Merge "Add resume action button for new layout" into tm-dev am: 23cbcff7 -s ours am: 3a092d8a -s ours

am skip reason: Merged-In I5018fc3ed772f3b1b80402968d96fc4d7333c613 with SHA-1 88cfc311 is already in history

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

Change-Id: Ie7dc59780fa148d9459a98705d7595e018dfd787