Merge "Don't log meaningless caps change" am: adb6c2d4 am: ccfd7908

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



Change-Id: Idb7360e7d170c85baa70011096d909b2dd902101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>