Merge "Trigger am and wm presubmit tests for code change under core/java/android/app"