Merge "Support Multi-User AppSearch within SystemServer"