tree 256517237aaa3f804b9695902bd06c463ef46f6e
parent 0b200796e4d093ca057cee092f448bb29324a654
parent b39151b9f4f73faa65fef5d097436037b1ce26f4
author Soonil Nagarkar <sooniln@google.com> 1588720065 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588720065 +0000

DO NOT MERGE Don't crash if already unregistered am: 07c129cb1a am: b39151b9f4

Change-Id: I652d05d4e8a3bba3b32ce9b59c68f06d7b886428