Merge changes I6ed5a493,If180894e into main

* changes:
  Add NotificationRowContentBinderRefactor flag
  Re-enable NotificationContentInflaterTest