Merge "Mark Soong maintainers as a last resort suggestion" am: 2885623021

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

Change-Id: I6da8604f80a290bca170bbdf1246bae1efa4cef3