4a55eebf26
This reverts commit 3cc74c71ef907a76547424aea6597f7b2907e9fb. We saw app crashes due stricter classification of non-SDK APIs. Bug: 115284625 Bug: 113881436 Test: phone boots Change-Id: I689d0fbf66fabeffa5032e13f2f1f314c50b6cc5