Merge "Improved comment about DrmStore.ConstraintsColumns"