servicemanager: remove performance hack am: d221c25182 am: 5eb786d156

Change-Id: I3e98efe6bb7b372b036ee24cc747b799cc14922c