Merge "Javadoc improvements related to the device policy management role holder updater" into tm-dev