Merge "TEMP add missing remap log, reduce log spam" into sc-dev am: ac6a92ff am: fb839299 am: 219ea61d

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

Change-Id: I305c8e4bc3ee54d862258bb29fe882ed206f0467