Merge "Add source prop for ATD image." am: 6ba05b6990 am: 587e80895f

Original change: https://android-review.googlesource.com/c/platform/development/+/1871056

Change-Id: I830737e489ddd3a46f5bc2d99d689a5b612fdfdf