Fixes: 183547536 Test: . frameworks/base/tests/Codegen/runTest.sh Change-Id: Ifffac8c560a8e2e9e0543d523738ad529af633e9