Merge "setProperty check for byte limit" am: 18b48023 am: 4cd99146 am:...

Merge "setProperty check for byte limit" am: 18b48023 am: 4cd99146 am: 39709e6b am: 5b37044c am: 94d2679f

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



Change-Id: I17d7a5feaf60ef8910c6f12defd70cf2821405ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>