Merge "Make doze parameters customizable" am: af0593a54a am: 6cfb1afc8d

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

Change-Id: I074ad5b510fef78c79b0fc8b10af0445d0804457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>