Merge "Fix the set member size check error" am: 0c02dc46 am: 519f76e7 am:...

Merge "Fix the set member size check error" am: 0c02dc46 am: 519f76e7 am: 3c0fbb9e am: 6784700a

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

Change-Id: I1e9f8c653bcbef81f7a92d7c76f8347d6496b4d7