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

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