Merge "Remove unnecessary debugging flag." into tm-qpr-dev am: e14a002e am: 79191fd3

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



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