Android 7.0.0 Release 33 (NBD92G)
resolve merge conflicts of 3654ad0 to mnc-dr-dev

Bug: 33818508
Bug: 34013472
Change-Id: I2e99cbceba1c00555d624e8975522725e362362b
(cherry picked from commit 37345554fea84afd446d6d8fbb87feea5a0dde3f)
1 file changed