Merge "Clean up hasSystemFeature binder cache"