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

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

Bug: 111935745
Change-Id: I6a2927c945c15564cc034eea55097f86a03de8ca