4dd6ab3ca1
+ Also remove PredictionModel.mCachedComponentKeys Bug: 156747920 Bug: 156041043 Test: Manual Change-Id: I56dac1c6ac0a1bb93363342006232fc1ba42a3b4