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