Merge remote-tracking branch 'github/main' into may17-merge

Change-Id: I9dde72343c3604d0da28e4317ffdd212a92232e4

.google/packaging.yaml

@@ -0,0 +1,27 @@
+# Copyright (C) 2022 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# GOOGLE SAMPLE PACKAGING DATA
+#
+# This file is used by Google as part of our samples packaging process.
+# End users may safely ignore this file. It has no relevance to other systems.
+---
+status:       PUBLISHED
+technologies: [Android]
+categories:   [Architecture]
+languages:    [Kotlin]
+solutions:    [Mobile]
+github:       android/nowinandroid
+level:        ADVANCED
+license: apache2

README.md

@@ -46,7 +46,7 @@ for more details.
 # Architecture
 
 The Now in Android app follows the
-[official architecture guidance]([official architecture guidance](https://developer.android.com/topic/architecture))
+[official architecture guidance](https://developer.android.com/topic/architecture) 
 and is described in detail in the
 [architecture learning journey](docs/ArchitectureLearningJourney.md).