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

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

Change-Id: Ic9912a9f7ed423c13060b0daf4a2fae7c2d3a378