Android 6.0.1 Release 80 (MOB31Z)
Merge remote-tracking branch 'goog/security-aosp-mnc-mr1-release' into HEAD

Change-Id: Idaef69712882db4a8eb63159775493e7713d67b8