Merge "Update DISALLOW_DUPLICATE_FIELD_IN_SKELETON" am: 5bba56e147 am: 81eb255fa2 am: 0e6d9772c2

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

Change-Id: I264b82318fb8331f85811a3d45c589d3c2bfeba9