Merge "Merge "Persists share targets after reading from Apps xml resource" into qt-dev am: ffdf5b5639 am: ad2408cff5" into qt-r1-dev-plus-aosp
am: 4ed303afe5

Change-Id: Ifc8395a205970e5abfb791e01a739d1d76622878