Merge "Derestrict PROP_NAME_MAX." am: caf6c158bb

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

Change-Id: Iec80d5a3b0c482d33c6551f06a4f5ddd6feb5474