Android 7.0.0 Release 36 (NBD92Y)
Merge cherrypicks of [3751454, 3751159, 3752387, 3752388, 3752377, 3752378, 3751455, 3752906, 3752907, 3752908, 3753095, 3753096, 3753097, 3753098, 3751456, 3751160, 3751647, 3753069, 3753070, 3753071, 3753072, 3753073, 3753074] into nyc-bugfix-release

Change-Id: I710c229e232a42723c492a97c676ef80a8dcfa29