Merge "Copy private resources into SettingsLib's ProgressBar." into qt-dev
am: 5bac48f7c0

Change-Id: Ief691feb48e7e2e8b471d00c5caaf73f9a023365