DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master

Bug: 120502534
Change-Id: I7351a1832c4bd2fd86324183ab83e9088d716822
tree: 780004988479b46fa98544c524c3c8d9ab0df576
  1. framework/
  2. OWNERS