Merge "Add Light/Dark theme for bugreport warning dialog" am: 6748f4cc07 am: 54c4b58fa1

Change-Id: Iba498feed8b50acde03d91d5a8911b6822378862