Merge changes from topic "switch-to-os-arg" into main
* changes:
Add microdroid_16k kernel
Update kernel to builds 12570979
vm tool: rename --gki arg to more generic --os one
Generalize our parameterized tests
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
index 245d2b9..af41c85 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/MainActivity.java
@@ -128,7 +128,9 @@
+ "&fontWeightBold="
+ (FontStyle.FONT_WEIGHT_BOLD + config.fontWeightAdjustment)
+ "&screenReaderMode="
- + mAccessibilityManager.isTouchExplorationEnabled();
+ + mAccessibilityManager.isTouchExplorationEnabled()
+ + "&titleFixed="
+ + getString(R.string.app_name);
try {
return new URL("https", VM_ADDR, TTYD_PORT, "/" + query);