Merge "Migrate plans to @SystemApi, evolve permissions." into oc-mr1-dev
am: 2c131cafae

Change-Id: I1f1d834712004b520a02d3116de945c668236f81