android-7.1.2_r36

initial-contribution@android.com

f8505e2d · Merge cherrypicks of [2310196, 2310339, 2310340, 2310175, 2310320, 2310321,... · May 24, 2017

Android 7.1.2 Release 36 (N2G48H)