Merge branch 'dev_xixijuchang_240103' of http://gitlab.mints-id.com/android/android_vedio into dev_xixijuchang_240103

# Conflicts:
#	video/app/build.gradle