tree b3d0462d48869b25bdbf4caffc8bbf2b9b748db4
parent 292d7a369228a50b154a60e1b9ab04ecea90f610
parent 18900c462c16c0e3784b8bb6959426caa93cb8cb
author Brett Chabot <brettchabot@google.com> 1551466538 -0800
committer Brett Chabot <brettchabot@google.com> 1551478684 +0000

resolve merge conflicts of 18900c462c16c0e3784b8bb6959426caa93cb8cb to stage-aosp-master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8ad986d06195bcd2861023e943c4ea7d0e2be729
Merged-In: Ib04d80954bd8536914d88c66b28e6632e60a6245