Merge "Fix the default battery drain monitor window size in AppBatteryTracker" into tm-dev am: d6433e70 am: a2b6c30b

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

Change-Id: I42d5ec1b515b58efd9c886ae8445cb6668753203