am 54c091d2: Merge "Move policy and session to AOSP"

* commit '54c091d284b15e14cbcbce983354f679526672ec':
  Move policy and session to AOSP