Merge "Remove extra comma" am: d44e152f78 am: a3996d9bfa

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1547614

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b9a7aca91edb0ad04f1f8d1247084d194eb98d9