Merge "Use "collapsible indent" for actions of any notification type." into...

Merge "Use "collapsible indent" for actions of any notification type." into sc-dev am: fd4d01d8 am: dd894de1

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

Change-Id: Id40f68e06636962d2a1ae7fa402a8fe0b66324b2