am 5a71f832: (-s ours) Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master
* commit '5a71f83227f0340a265f34b226d8fe01d4dd9773':
This commit is contained in: