Merge changes from topic "am-2b82a146-0fd5-4194-a35d-ab67d3739931" into ub-launcher3-master

* changes:
  [automerger] Adding support for badging instant app icons. am: f5523921c3
  Adding support for badging instant app icons.