Merge "Only replace new line characters if the wakelock name contains one The...

Merge "Only replace new line characters if the wakelock name contains one The original operation creates new string everytime which is expensive" into oc-mr1-dev am: 8ce50255
am: 311cc0b9

Change-Id: I0bae1c8199771608571c208cb176c1c66f5ef08f