Android n mr1 preview 1
resolve merge conflicts of 55caa15 to stage-aosp-master
am: 2694c6a594

Change-Id: Ie59976f602e937366c10fbf2ed89fc0676926c90