Merge "Remove pymock now everyone's on python3." am: 973c30bb0b

Original change: https://android-review.googlesource.com/c/platform/external/python/mock/+/1845269

Change-Id: Iaeb2bccf226919d60708e5f081183e4564007429