Merge changes from topics "presubmit-am-199afe44c7a248abae070cf5d976833e", "presubmit-am-eae8cb1f01f04fa1bdbe809fafb5a9ff" into tm-dev am: cca85a0e84 am: 9f10f9e25e

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/17048945

Change-Id: If55477bba3cc41220f36fa1d265a3a52e672e042