(cherry picked from commit 0fee732c) Bug: 32163131 Test: runtest frameworks-net Change-Id: Iec8af5191b4da495e47ef97d70a03a5d2e75cfe2