Merge changes from topic "am-16d642de-bdbc-4620-a1c0-f438265a60e1" into ub-launcher3-master

* changes:
  [automerger] Dumping the excoded view hierarchy instead of the default activity dump am: 55eb556a4b
  Dumping the excoded view hierarchy instead of the default activity dump