This reverts commit cb5a80ea57. Reason for revert: Was not the cause of the test failure Fixes: 186622527 Test: atest FrameworksCoreTests:ContextTest Change-Id: I705854f080200f0465d94a7754e710f05a3ec92c
cb5a80ea57