Merge changes from topic "no_sm_proc" into main am: 03cb1fd21d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3365276

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