am 93870605: am d5a90829: am 1e48a1ee: am c152c7aa: Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev

* commit '9387060528b22b455974eb060d573b37b81e6e3d':
  Revert "Frameworks/base: Update to preloaded-classes"