Merge "Fix diff-and-update-golden.sh path" into main am: 40e819f6f1 am: dd9c990bed

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3342758

Change-Id: If63a87da3fed66f95a2a2bf20fe7d1c2b55b90a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>