Test: $ runtest frameworks-net pass Bug: 32198976 (cherry picked from commit 8b06bcdf) Change-Id: I527f98c28b31f490ea999222ef8d0b685a2f24ed