Merge "Fix final nits from noticeindex change." am: 8eeff2b0 am: 2af8146c

Original change: https://android-review.googlesource.com/c/platform/build/+/2283060



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