Merge "Update task bar assertion on OpenActivityFromBubbleOnLocksreenTest" into udc-dev