resolve merge conflicts of 796987482 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ica884c137c5f21e261600b2b011ab963036c0cdb
Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core
Cr-Mirrored-Commit: bb5ec4a9260ad6140452dff90564a289da12b567
1 file changed