Merge "Put debug/log code under verbose flag" into sc-dev am: 57aa9a97 am:...

Merge "Put debug/log code under verbose flag" into sc-dev am: 57aa9a97 am: 8c425717 am: e1c15b52

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

Change-Id: I61e8162f00850932222618b022ba7081a319d04c