Merge "Merge "Persists share targets after reading from Apps xml resource" into qt-dev am: ffdf5b56 am: ad2408cf" into qt-r1-dev-plus-aosp