Merge "Merge "make perf-measuring code safe across SDK levels" into qt-dev am: f4a034c42c am: 87ab083ade am: 64b6e6d334" into qt-qpr1-dev-plus-aosp
am: 85ff81cba2

Change-Id: I1ae763172664111afb9631cde755a6417cebaa4a