Merge changes Id036fa48,I54402913 into main

* changes:
  Inline BaseHeadsUpManager addEntry
  Set up deviceless testing for BaseHeadsUpManagerTest