Merge "created FORCE_DEVICE_POLICY_MANAGER_LOG and CLEAR_FREEZE_PERIOD" am: 531fcd63ca am: 51a15fab3f

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

Change-Id: Ida36341fdbff976ae4b60ab71d78195facb36621