Merge "BatteryStatsService: Allow unknown wakeup string" am: 754d78cb7d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04cd90efb331c4dbbf4309163e710951e660dfa1