Merge changes I91953608,I09b3ee97 into main

* changes:
  [RON] Inflate and bind Rich Ongoing Views
  [RON] Extract a RichOngoingContentModel from timer notifications for testing.