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

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

Change-Id: Ib0e16b856a30f48e612991049a785b663c61f1b3