Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp
am: 837f1167ca

Change-Id: I2a510538bace272330e1d4446adf2451f3bb4c07