Merge "BatteryStatsService: Allow unknown wakeup string" am: 754d78cb7d am: 32ae89039f am: f5c637719f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fc06889dd782b73044512e90c02cb130697a01c