Merge "Remove ST INTERCEPTED state" into udc-dev am: 528cd329 am: 8f2eefa2 am: 8ebd6e48 am: c845996f

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



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