Merge "Fix the set member size check error" am: 0c02dc46e1

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

Change-Id: I932db5c3d3ac8c993d7bbd68557aa0cd0167283d