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

* commit '1e48a1eec0a5f1d015256e38f627947105af5bac':
  Revert "Frameworks/base: Update to preloaded-classes"