Merge commit '24db25eb2160a04377dd8b278b3cf99a89db914a' into update am: 683dfed778 am: 5af8b817a0 am: 55e80993ce

Original change: https://android-review.googlesource.com/c/platform/external/nullaway/+/2831253

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