This reverts commit d1f10c3f. We saw app crashes due to stricter classification of non-SDK APIs. Bug: 115284625 Bug: 113881436 Test: phone boots Change-Id: Iff294aba35e96341e4a8cb4809ba8dbbc46e5a9d (cherry picked from commit 64a1321f)