Merge "Use sampled value in hidden api logger" am: 619ed85e81
am: 818e8c1bf2

Change-Id: I2cb5ac6bfae6cc98398688a4b5695260a863578a