Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I695db52f5e22509401258e8b083e7650d401d993
tree: 5861509d4e63b558936511bb0b96c0e890e8cec3
  1. framework/
  2. service/