(cherry picked from commit 023328e204d2ab167f45827a13bc31b68ee27d59) Bug: 204153604 Test: build, FrameworksVcnTests Change-Id: I2e92f27b4d10612d9000c0fc0d5866dd0313a336 Merged-In: I2e92f27b4d10612d9000c0fc0d5866dd0313a336
(cherry picked from commit 023328e204d2ab167f45827a13bc31b68ee27d59) Bug: 204153604 Test: build, FrameworksVcnTests Change-Id: I2e92f27b4d10612d9000c0fc0d5866dd0313a336 Merged-In: I2e92f27b4d10612d9000c0fc0d5866dd0313a336