Merge remote-tracking branch 'upstream/cr-main-10.2' into cm-10.2

Conflicts:
	AndroidManifest.xml