Merge "TEMP add missing remap log, reduce log spam" into sc-dev am: ac6a92ff am: 36d92b62 am: 779f1321

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

Change-Id: I6d113f5115a1268358f9d13863b5c5563ad5142c