Merge "Changing app classification logic from manifest-based to WLC-based" into q-keystone-qcom-dev