241377b10a
This reverts commit 621e7968adf0253d5e22406f02ccc8bcc0eda5ec. Many of the fields that were moved are annotated @UnsupportedAppUsage, so the CL would have had undesirable app compat impact. Further, because investigation has revealed that lock contention *is* possible, we need to always acquire the lock anyway so there is no longer a benefit in keeping all of the mutable state in a single field that can be atomically set to null. Bug: 114337214 Test: Treehugger (cherry picked from commit dc9f4b4d5d28fc68b1b5e4e8500bf67d4b11621d) Change-Id: I202c5653cb086d99228491e161a159bad640105a Merged-In: I202c5653cb086d99228491e161a159bad640105a