Merge "[NS03] Mix in other CS-managed properties" into sc-dev am: 73cdd8195a

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

Change-Id: I43967b8f8fabcd77b9b8ad5ee442b0e1ab9bee9b