Merge "Revert "Clean up hasSystemFeature binder cache""