am 98d2d09c: am 4837321c: am f0229f22: am 2cbc7c68: Merge "Workaround for AIOOB exception in ProximityInfo"
* commit '98d2d09c78372f8d56896ffe7a7b48bc6b4e1fee':main
commit
9e6a7d4ff5
* commit '98d2d09c78372f8d56896ffe7a7b48bc6b4e1fee':main