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

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

Change-Id: Ia3f253c9ca30e09f1160045320e255ce261cb3e3