Merge changes from topic "revert-10162577-b147245740-activitable-notif-view-component-NBJNWVANRZ"

* changes:
  Revert "Fill in ActivatableNotificationViewController."
  Revert "Add new ExpandableNotificationRowController."