Merge "Add permission for bluetooth app in non-primary users" into jb-mr2-dev