Merge "Use non-logging compat framework calls" into sc-dev am: 4d4f3998 am: 5fe8ac2c am: e44c7cb7

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

Change-Id: Id70deb74f8b838717f0f92e18faa4df1c234abb7