[automerger skipped] Merge "Change size of LocalLog to powers of 2." am:...

[automerger skipped] Merge "Change size of LocalLog to powers of 2." am: 470f0c7f am: f700142d am: 8bd05fcb am: cf87cab3 -s ours

am skip reason: Merged-In I42679c3c096a1b6ee26d3e7817974eff09fcdf49 with SHA-1 1dad5967 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1750201

Change-Id: Ia777335aec2799804d10f1ae904d343559e58f8e