Merge "Exclude list may have comment" am: 71caa549f3

Original change: https://android-review.googlesource.com/c/platform/development/+/2158136

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