Merge "Track launch time per windowingMode" into pi-dev am: db712bec4a
am: fcabe1c2a0

Change-Id: I65307381b55bf25d703aba99355b2ab03e7e2f11