Merge "Do not add layout reason if there is no config effect" into tm-qpr-dev am: 5eb759d2

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



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