Merge "Update reference to sdkextensions post move" am: 37afde1eeb am: ac0438c386 am: 2b8061b1f9 am: ff474e5e5c am: b3b4b11ab4

Original change: https://android-review.googlesource.com/c/platform/cts/+/1318669

Change-Id: I15509f5936695b02efb0042e6557e0dc77766ae3