android-7.1.2_r33

initial-contribution@android.com

b7fe2d04 · Merge cherrypicks of [2310999, 2310925, 2310891, 2311000, 2310892, 2310858,... · May 24, 2017

Android 7.1.2 Release 33 (NZH54D)