tree c421a7d22969841b6cbe5260e682f4073dbe644c
parent ddb5acced060c9873cdab1d84be6eafc64957fcc
parent b9c0abdcad4a939f8a77e4b2d6acac8f9e900ec5
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1689747189 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1689747189 +0000

Merge changes from topic "am-d377bc6204204dc5bfea0ff1d15efb0c" into main

* changes:
  [automerger skipped] Merge "Guard against NPE in the Settings Tile lib" into udc-d1-dev am: 7913e25503 am: 56bc852fe1 -s ours am: 8e70c15347 -s ours
  [automerger skipped] Merge "Fix the NPE in the Settings Tile lib" into udc-d1-dev am: 2be625e241 am: dd7ae8709e -s ours am: 622ff1d5fb -s ours