Merge "Merge "[ErrorProne] Fix Error Prone warnings in aware/p2p code" into oc-dr1-dev am: 43dc06a9a9" into oc-dr1-dev-plus-aosp
am: 1bbc25d903

Change-Id: I6db6577b701977806cd14014a4700d71619915c4