[automerger skipped] Fix dynsystem.BootCompletedReceiver am: cf0e2039 -s ours am: 4880939b -s ours

am skip reason: Merged-In I31c438fcd70e71eb2a5b14cdb713bd25516e8532 with SHA-1 cf0e2039 is already in history

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

Change-Id: I931d5310770a022937cb6c7262ad218732c2720c