Merge "Merge "Add privapp config for cluster." into qt-dev am: 826c01e8e6 am: 849976d753" into qt-r1-dev-plus-aosp