Merge "Suppress the error warning" am: e851f2d6 am: 0e161700

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2468620



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