Merge "Fix the problem of excessive sensitivity error" into pie-cts-dev am: 4c7f85a9f1 am: 999dda2997 am: 2dac824941 am: 1faac9e214 am: d94c0d9de8 am: 641eb0c3bf am: a25ae72176 am: 708e96613c am: ab642fcd3e

Original change: https://android-review.googlesource.com/c/platform/cts/+/2161658

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