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

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

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