tree 51a676ac8cd849b3e8b8dbf91bce9dc3573577c4
parent 3155a208c4c882eb4f0780cfc1cc403098e91787
parent e325121881e375cf851c7442709e3ae48f9ff094
author Xin Li <delphij@google.com> 1606620609 -0800
committer Xin Li <delphij@google.com> 1606620609 -0800

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: I7d44dd53cd0f77438d948b966b5de2c32f3347e8
Change-Id: Id2dae5622864032c8734ddccfc455a7aa7174c69