Merge "Suggest developers use -eng builds instead when they lunch -userdebug"...

Merge "Suggest developers use -eng builds instead when they lunch -userdebug" into main am: 9075d322 am: d55332f5

Original change: https://android-review.googlesource.com/c/platform/build/+/2803914



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