Manual merge of pi-dev to pi-dev-plus-aosp

Required to pre-populate hardware/qcom/sm8150/Android.bp and
Android.mk link targets prior to populating manifest.

Bug: 111935745

Change-Id: I7239d88cb4c3f5016632744e8d52ef14178d4650