Merge "Raise minSdkVersion to fix lint error" into main