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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98fd8bfc2b9c624e20ea42ebc2e27ce71795dbd9