Merge "Mark APIs as 'final' as requested by Metalava." into main