This reverts commit c54ebba2. Bug: 188059515 Test: atest FrameworksCoreTests:ContextTest Change-Id: I986563142dac135281889e811e6e5219d728d5d1