sync bug_map with downstream Bug: 239403666 Test: boot Change-Id: I7e95cc5169ce56f1bba031b4d8a83ab1d5c80b26 Merged-In: If07a3611f40324d985a387c6dd7f2570c90c7c11