Merge "Unsupported app usage API cleanup" am: a2b2183a24
am: ff98c6d69f

Change-Id: I3bbf9b130374b2f387de56034d22e2cf6248a9ac