Merge remote-tracking branch 'remotes/aosp/l-preview' into katkiss-l-preview

Conflicts:
	default.xml

Change-Id: If0ddc5d856f5dbbb6cd0908818f99217fc17897e