am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2

* commit '3148557c42aaa8abf4001dc6fd759e911ba55280':
  DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()