am 461f06f4: am 53a5e317: Merge "Wrap measurement optimization in targetSdk check" into klp-dev
am 461f06f4: am 53a5e317: Merge "Wrap measurement optimization in targetSdk check" into klp-dev

* commit '461f06f4037849d5075d947852306bafdf0e949c':
  Wrap measurement optimization in targetSdk check

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base