Merge "Fix Screen Off logging for Flip to Screen Off." into sc-dev am: d499530f35

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

Change-Id: I35151846e65b06c6507604904d70912b9887fd0a