Merge "Unsupported app usage API cleanup"
am: a2b2183a24

Change-Id: I2a83151008e0f59703ffa89c9fa7bbaf2452a68e