[automerger skipped] Merge "Adding logging to track down alpha changes" into sc-qpr1-dev am: 1f012650 am: 72f79b63 -s ours am: 12d27f4f -s ours

am skip reason: Merged-In Ifd52101baa7af45f2253fd6c10b5d071c1a0e674 with SHA-1 6ae68138 is already in history

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

Change-Id: I91fd4157c6bbb5ab91786d840e12af0cb1c999c1