Merge "created FORCE_DEVICE_POLICY_MANAGER_LOG and CLEAR_FREEZE_PERIOD" am: 531fcd63ca

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

Change-Id: I6d9bd8c1e97e9b40b7458d7f82466fb665d74f09