tree 374914b556f74c12cb9e527d50d7f0ccb6da8d20
parent 1e33fdf6a754dbb2bbfa70b1ed2ede351ce360d2
parent 1b0afb17d36192269406c525dd42196b8cfc533e
author Treehugger Robot <treehugger-gerrit@google.com> 1614122529 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614122529 +0000

Merge "Fix NPE in AutofillManager when feature autofill is disabled" am: 782fa90be7 am: 1b0afb17d3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1511471

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79501aa89e25a7b2470bb3f2572b44b4db636a4b