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

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