Merge "Derestrict PROP_NAME_MAX." am: caf6c158bb am: 626e204e7e am: 1e6326f5d6

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

Change-Id: I55ded3c2e8d15deee0592078670dac174c9d0678