Platform Tools Release 31.0.0 (7110759)
Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE

Merged-In: I1fd1e50fcf6f79ae904cc7d6576c2f18039cc55c
Change-Id: I20f3ddc214cb92963147e324f6944e705f87bb81