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

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

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