Merge "Bug 5126088 - update layout for activate device policy activity"