Merge "Merge "Track both framework and app overlays per package" into oc-dev am: 65ffdba7f7 am: 895b695ab0" into oc-dr1-dev-plus-aosp
am: 80c75595b8

Change-Id: Ic303e2a8cd2ee5362f3879993764a561adcb21a5