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

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