Merge "Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON" am: 5bba56e147

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1490737

Change-Id: Ifb31bb97e89c434e7556826bc4c618e902c7932d